From 9cca8c54a687c25927d0a5cc6040bc68138cb83a Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Mon, 27 Oct 2014 17:26:49 +0100 Subject: [PATCH] Deprecated a few more things --- src/cargo/ops/cargo_rustc/compilation.rs | 3 ++- src/cargo/ops/cargo_rustc/layout.rs | 6 ++++++ src/cargo/ops/cargo_rustc/mod.rs | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cargo/ops/cargo_rustc/compilation.rs b/src/cargo/ops/cargo_rustc/compilation.rs index 646c79a38..381cf9688 100644 --- a/src/cargo/ops/cargo_rustc/compilation.rs +++ b/src/cargo/ops/cargo_rustc/compilation.rs @@ -23,6 +23,7 @@ pub struct Compilation { /// /// This is currently used to drive some entries which are added to the /// LD_LIBRARY_PATH as appropriate. + // TODO: deprecated, remove pub native_dirs: HashMap, /// Root output directory (for the local package's artifacts) @@ -43,7 +44,7 @@ impl Compilation { pub fn new(pkg: &Package) -> Compilation { Compilation { libraries: HashMap::new(), - native_dirs: HashMap::new(), + native_dirs: HashMap::new(), // TODO: deprecated, remove root_output: Path::new("/"), deps_output: Path::new("/"), tests: Vec::new(), diff --git a/src/cargo/ops/cargo_rustc/layout.rs b/src/cargo/ops/cargo_rustc/layout.rs index 65036d1c8..1443ff1ba 100644 --- a/src/cargo/ops/cargo_rustc/layout.rs +++ b/src/cargo/ops/cargo_rustc/layout.rs @@ -165,6 +165,8 @@ impl Layout { pub fn dest<'a>(&'a self) -> &'a Path { &self.root } pub fn deps<'a>(&'a self) -> &'a Path { &self.deps } pub fn examples<'a>(&'a self) -> &'a Path { &self.examples } + + // TODO: deprecated, remove pub fn native(&self, package: &Package) -> Path { self.native.join(self.pkg_dir(package)) } @@ -183,6 +185,8 @@ impl Layout { pub fn old_dest<'a>(&'a self) -> &'a Path { &self.old_root } pub fn old_deps<'a>(&'a self) -> &'a Path { &self.old_deps } pub fn old_examples<'a>(&'a self) -> &'a Path { &self.old_examples } + + // TODO: deprecated, remove pub fn old_native(&self, package: &Package) -> Path { self.old_native.join(self.pkg_dir(package)) } @@ -224,6 +228,7 @@ impl<'a> LayoutProxy<'a> { pub fn examples(&self) -> &'a Path { self.root.examples() } + // TODO: deprecated, remove pub fn native(&self, pkg: &Package) -> Path { self.root.native(pkg) } pub fn build(&self, pkg: &Package) -> Path { self.root.build(pkg) } @@ -236,6 +241,7 @@ impl<'a> LayoutProxy<'a> { pub fn old_examples(&self) -> &'a Path { self.root.old_examples() } + // TODO: deprecated, remove pub fn old_native(&self, pkg: &Package) -> Path { self.root.old_native(pkg) } diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 72a6f3ec1..afb1cd5d9 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -809,6 +809,7 @@ fn build_deps_args(mut cmd: ProcessBuilder, target: &Target, package: &Package, // Traverse the entire dependency graph looking for -L paths to pass for // native dependencies. + // TODO: deprecated, remove let mut dirs = Vec::new(); each_dep(package, cx, |pkg| { if pkg.get_manifest().get_build().len() > 0 { @@ -871,6 +872,7 @@ pub fn process(cmd: T, pkg: &Package, let mut search_path = DynamicLibrary::search_path(); search_path.push(layout.deps().clone()); + // TODO: deprecated, remove // Also be sure to pick up any native build directories required by plugins // or their dependencies let mut native_search_paths = HashSet::new(); -- 2.30.2